Handle the returned parent_path being NULL. Fixes #136662.

2004-03-09  Federico Mena Quintero  <federico@ximian.com>

	* gtk/gtkfilechooserdefault.c (get_file_info): Handle the returned
	parent_path being NULL.  Fixes #136662.

diff --git a/ChangeLog b/ChangeLog
index 7a4fa0556f6a08de7cb9767d423e35d1d63e6839..9182cb28e623063d5ca72a50e7ce4488425b210a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-09  Federico Mena Quintero  <federico@ximian.com>
+
+       * gtk/gtkfilechooserdefault.c (get_file_info): Handle the returned
+       parent_path being NULL.  Fixes #136662.
+
 2004-03-09  Federico Mena Quintero  <federico@ximian.com>
 
        * gtk/gtkfilechooserdefault.c (shortcuts_drag_data_received_cb):

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 7a4fa0556f6a08de7cb9767d423e35d1d63e6839..9182cb28e623063d5ca72a50e7ce4488425b210a 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2004-03-09  Federico Mena Quintero  <federico@ximian.com>
+
+       * gtk/gtkfilechooserdefault.c (get_file_info): Handle the returned
+       parent_path being NULL.  Fixes #136662.
+
 2004-03-09  Federico Mena Quintero  <federico@ximian.com>
 
        * gtk/gtkfilechooserdefault.c (shortcuts_drag_data_received_cb):

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 7a4fa0556f6a08de7cb9767d423e35d1d63e6839..9182cb28e623063d5ca72a50e7ce4488425b210a 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2004-03-09  Federico Mena Quintero  <federico@ximian.com>
+
+       * gtk/gtkfilechooserdefault.c (get_file_info): Handle the returned
+       parent_path being NULL.  Fixes #136662.
+
 2004-03-09  Federico Mena Quintero  <federico@ximian.com>
 
        * gtk/gtkfilechooserdefault.c (shortcuts_drag_data_received_cb):

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 7a4fa0556f6a08de7cb9767d423e35d1d63e6839..9182cb28e623063d5ca72a50e7ce4488425b210a 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2004-03-09  Federico Mena Quintero  <federico@ximian.com>
+
+       * gtk/gtkfilechooserdefault.c (get_file_info): Handle the returned
+       parent_path being NULL.  Fixes #136662.
+
 2004-03-09  Federico Mena Quintero  <federico@ximian.com>
 
        * gtk/gtkfilechooserdefault.c (shortcuts_drag_data_received_cb):

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 7a4fa0556f6a08de7cb9767d423e35d1d63e6839..9182cb28e623063d5ca72a50e7ce4488425b210a 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2004-03-09  Federico Mena Quintero  <federico@ximian.com>
+
+       * gtk/gtkfilechooserdefault.c (get_file_info): Handle the returned
+       parent_path being NULL.  Fixes #136662.
+
 2004-03-09  Federico Mena Quintero  <federico@ximian.com>
 
        * gtk/gtkfilechooserdefault.c (shortcuts_drag_data_received_cb):

diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index 2affafef65a605f4abe689a210b918745699ced9..0e88ba76d903c214b6f1f9d8a53e190fd006f1ca 100644 (file)
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -757,10 +757,12 @@ get_file_info (GtkFileSystem *file_system, const GtkFilePath *path, gboolean nam
   GtkFileFolder *parent_folder;
   GtkFileInfo *info;
 
+  info = NULL;
+
   if (!gtk_file_system_get_parent (file_system, path, &parent_path, error))
     return NULL;
 
-  parent_folder = gtk_file_system_get_folder (file_system, parent_path,
+  parent_folder = gtk_file_system_get_folder (file_system, parent_path ? parent_path : path,
                                              GTK_FILE_INFO_DISPLAY_NAME
 #if 0
                                              | GTK_FILE_INFO_ICON